Branch for 4.6: Update staging version to 4.7-unstable

* Change README to say `Xen 4.6-rc'
* Change XEN_EXTRAVERSION so that we are `4.6.0-rc'

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/README b/README
index 522f1a20b04918c694b985d8e553155db67abf83..a7d0033163f05ffc2e68288c354782bf3ced142d 100644 (file)
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
 #################################
-__  __            _  _    __
-\ \/ /___ _ __   | || |  / /_        _ __ ___
- \  // _ \ '_ \  | || |_| '_ \ _____| '__/ __|
- /  \  __/ | | | |__   _| (_) |_____| | | (__
-/_/\_\___|_| |_|    |_|(_)___/      |_|  \___|
+__  __            _  _   _____                     _        _     _
+\ \/ /___ _ __   | || | |___  |    _   _ _ __  ___| |_ __ _| |__ | | ___
+ \  // _ \ '_ \  | || |_   / /____| | | | '_ \/ __| __/ _` | '_ \| |/ _ \
+ /  \  __/ | | | |__   _| / /_____| |_| | | | \__ \ || (_| | |_) | |  __/
+/_/\_\___|_| |_|    |_|(_)_/       \__,_|_| |_|___/\__\__,_|_.__/|_|\___|
 
 #################################
 

diff --git a/xen/Makefile b/xen/Makefile
index 6088c9d42ccdfa57833b35f78f8a99c0498e5760..c556198b537f9e91472f44469fbcfb9c346711cf 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -1,8 +1,8 @@
 # This is the correct place to edit the build version.
 # All other places this is stored (eg. compile.h) should be autogenerated.
 export XEN_VERSION       = 4
-export XEN_SUBVERSION    = 6
-export XEN_EXTRAVERSION ?= .0-rc$(XEN_VENDORVERSION)
+export XEN_SUBVERSION    = 7
+export XEN_EXTRAVERSION ?= -unstable$(XEN_VENDORVERSION)
 export XEN_FULLVERSION   = $(XEN_VERSION).$(XEN_SUBVERSION)$(XEN_EXTRAVERSION)
 -include xen-version